Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 14 Feb 2010 12:17:36 +0000 (12:17 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 14 Feb 2010 12:17:36 +0000 (12:17 +0000)

Trivial merge